From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 25 Aug 2011 18:59:26 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~50
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=02dad38561d7f5499f4ca64130bd1d4a66c98bf3;p=emacs.git

Merge from trunk.
---

02dad38561d7f5499f4ca64130bd1d4a66c98bf3